cssprovider: Change location of builtin themes

Instead of
  /org/gtk/libgtk/theme/$THEME-$VARIANT.css
look at
  /org/gtk/libgtk/theme/$THEME/gtk-$VARIANT.css
and that way mirror the directory layout of real themes.

diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 2f1099182c803b3138bd00866cb838a1da3e6896..6061a75639607a6a0f1b6abba0feb9e7826ff88d 100644 (file)
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -1213,10 +1213,10 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
        echo "  <gresource prefix='/org/gtk/libgtk'>" >> $@; \
        for f in $(srcdir)/theme/Raleigh/*.css; do \
          n=`basename $$f`; \
-         echo "    <file alias='theme/Raleigh.css'>theme/Raleigh/$$n</file>" >> $@; \
+         echo "    <file alias='theme/Raleigh/gtk.css'>theme/Raleigh/$$n</file>" >> $@; \
        done; \
-        echo "    <file alias='theme/Adwaita.css'>theme/Adwaita/gtk.css</file>" >> $@; \
-        echo "    <file alias='theme/Adwaita-dark.css'>theme/Adwaita/gtk-dark.css</file>" >> $@; \
+        echo "    <file>theme/Adwaita/gtk.css</file>" >> $@; \
+        echo "    <file>theme/Adwaita/gtk-dark.css</file>" >> $@; \
         echo "    <file>theme/Adwaita/gtk-contained.css</file>" >> $@; \
         echo "    <file>theme/Adwaita/gtk-contained-dark.css</file>" >> $@; \
         for f in $(srcdir)/theme/Adwaita/assets/*.png; do \
@@ -1227,14 +1227,15 @@ gtk.gresource.xml: Makefile.am inspector/Makefile.inc
           n=`basename $$f`; \
           echo "    <file>theme/Adwaita/assets/$$n</file>" >> $@; \
         done; \
-       echo "    <file alias='theme/HighContrast.css'>theme/HighContrast/gtk.css</file>" >> $@; \
-       echo "    <file alias='theme/HighContrastInverse.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
+       echo "    <file>theme/HighContrast/gtk.css</file>" >> $@; \
+       echo "    <file alias='theme/HighContrastInverse/gtk.css'>theme/HighContrast/gtk-inverse.css</file>" >> $@; \
        echo "    <file>theme/HighContrast/gtk-contained.css</file>" >> $@; \
        echo "    <file>theme/HighContrast/gtk-contained-inverse.css</file>" >> $@; \
        if test "$(win32_theme)" = "yes"; then \
          for f in $(srcdir)/theme/win32/*.css; do \
            n=`basename $$f`; \
-           echo "    <file alias='theme/$$n'>theme/win32/$$n</file>" >> $@; \
+           m=`echo $$n | cut -b 5-` \
+           echo "    <file alias='theme/$$m/gtk.css'>theme/win32/$$n</file>" >> $@; \
          done; \
        fi; \
        for f in $(srcdir)/cursor/*.png; do \

diff --git a/gtk/gtkcssprovider.c b/gtk/gtkcssprovider.c
index 1c192c749336ed69bf3fecacb0d961559b97686f..c6481a60caec06d49f7c03382fc96142c7dbd44c 100644 (file)
--- a/gtk/gtkcssprovider.c
+++ b/gtk/gtkcssprovider.c
@@ -2106,9 +2106,9 @@ _gtk_css_provider_load_named (GtkCssProvider *provider,
    * themes.
    */
   if (variant)
-    resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s-%s.css", name, variant);
+    resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk-%s.css", name, variant);
   else
-    resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s.css", name);
+    resource_path = g_strdup_printf ("/org/gtk/libgtk/theme/%s/gtk.css", name);
 
   if (g_resources_get_info (resource_path, 0, NULL, NULL, NULL))
     {